Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from yujincheng08:master #195

Merged
merged 50 commits into from
Jun 2, 2024
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 27, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Dec 27, 2023
duzhaokun123 and others added 20 commits December 27, 2023 14:57
Bumps the maven-dependencies group with 3 updates:
com.google.protobuf:protobuf-kotlin-lite,
com.google.protobuf:protobuf-javalite and
[com.google.protobuf:protoc](https://github.com/protocolbuffers/protobuf).

Updates `com.google.protobuf:protobuf-kotlin-lite` from 3.25.1 to 3.25.2

Updates `com.google.protobuf:protobuf-javalite` from 3.25.1 to 3.25.2

Updates `com.google.protobuf:protoc` from 3.25.1 to 3.25.2
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/a9b006bddd52e289029f16aa77b77e8e0033d9ee"><code>a9b006b</code></a>
Updating version.json and repo version numbers to: 25.2</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/59eebe3e76ca77682437125839f504109a44ab36"><code>59eebe3</code></a>
Merge pull request <a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/14907">#14907</a>
from mkruskal-google/cmake-install-fix</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/05ad6525c3aae2ae5b6e1987227445a420caada7"><code>05ad652</code></a>
Only substitute prefixes during installation setup.</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/c709a34fbdf90f3fca092967dc90bdf7c6597ba4"><code>c709a34</code></a>
Merge pull request <a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/14800">#14800</a>
from mkruskal-google/leak-patch</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/3d5c709ebe01f1f9f3d3345cd4239e239081f8fd"><code>3d5c709</code></a>
Register a shutdown delete for C++ feature defaults</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/c529459e96c01be6e077957860e92309f935bd04"><code>c529459</code></a>
Merge pull request <a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/14765">#14765</a>
from protocolbuffers/25.x-202311152135</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/6ac04475591db12de14e89d3d750519c2ca9a4cc"><code>6ac0447</code></a>
Updating version.json and repo version numbers to: 25.2-dev</li>
<li>See full diff in <a
href="https://github.com/protocolbuffers/protobuf/compare/v3.25.1...v3.25.2">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
e.g., season_id = 6423
@yujincheng08 yujincheng08 force-pushed the master branch 7 times, most recently from 7859e3e to 8a27974 Compare April 28, 2024 03:06
@pull pull bot merged commit 637bd43 into shell-script:master Jun 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants